Merge.
authorsos22@douglas.cl.cam.ac.uk <sos22@douglas.cl.cam.ac.uk>
Fri, 19 Aug 2005 15:47:19 +0000 (15:47 +0000)
committersos22@douglas.cl.cam.ac.uk <sos22@douglas.cl.cam.ac.uk>
Fri, 19 Aug 2005 15:47:19 +0000 (15:47 +0000)
commitdf3303d149e9009eb7a5f8fb733a9e89269f1f3d
treeb894cc9ec4fc7cdb6434b3fe78bfc20439861e0b
parentb3c5293807641ef07e8502fa76383913e0867c77
parent18ac57ccb58fd50c2c4174ec684b19ce3d310dfa
Merge.

Signed-off-by: Steven Smith, sos22@cam.ac.uk
linux-2.6-xen-sparse/include/asm-xen/asm-x86_64/hypercall.h